Add support of upsert for Postgres and MySQL #987

mosyp · 2017-11-30T14:28:32Z

Fixes #16
Fixes #595

Taking into account experience from #595 I've came up with an another implementation of upsert feature for postgres and mysql

Checklist

Unit test all changes
Update README.md if applicable
Add [WIP] to the pull request title if it's work in progress
Squash commits that aren't meaningful changes
Run sbt scalariformFormat test:scalariformFormat to make sure that the source files are formatted

@getquill/maintainers

Nickersoft · 2018-01-30T03:10:11Z

Any update on this?

mosyp · 2018-01-30T09:06:21Z

@Nickersoft Hello, I'm working on it when I have time. I have plans to ship it with next 2.4.0 release

Nickersoft · 2018-01-31T23:57:57Z

@mentegy Cool! Thanks for the update :)

mosyp · 2018-04-06T16:03:54Z

@getquill/maintainers It's ready for review. Please refer information in readme for more details

fwbrasil · 2018-04-09T02:23:03Z

quill-core/src/main/scala/io/getquill/ast/Ast.scala

@@ -92,6 +92,8 @@ case class If(condition: Ast, `then`: Ast, `else`: Ast) extends Ast

 case class Assignment(alias: Ident, property: Ast, value: Ast) extends Ast

+case class Excluded(alias: Ident) extends Ast


Could you give a more descriptive name to these new AST classes? Or maybe nest them within an object that has a name that clarifies their purpose.

fwbrasil · 2018-04-09T02:28:04Z

quill-core/src/main/scala/io/getquill/ast/Ast.scala

@@ -129,6 +131,16 @@ case class Returning(action: Ast, alias: Ident, property: Ast) extends Action

 case class Foreach(query: Ast, alias: Ident, body: Ast) extends Action

+case class Conflict(insert: Ast, target: Conflict.Target, action: Conflict.Action) extends Action


I think OnConflict would be a better name

fwbrasil · 2018-04-09T02:34:07Z

besides the naming, everything else LGTM

fwbrasil · 2018-04-09T17:51:26Z

@mentegy the compilation is failing:

[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:457:19: object Conflict is not a member of package io.getquill.ast
[error]         stmt"${(i.onConflictIgnore.ast: Ast).token}" mustEqual
[error]                   ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:461:35: object Conflict is not a member of package io.getquill.ast
[error]         stmt"${(i.onConflictIgnore(_.i, _.s).ast: Ast).token}" mustEqual
[error]                                   ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:465:35: object Conflict is not a member of package io.getquill.ast
[error]         stmt"${(i.onConflictUpdate((t, e) => t.s -> e.s, (t, e) => t.i -> (t.i + 1)).ast: Ast).token}" mustEqual
[error]                                   ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:469:40: object Conflict is not a member of package io.getquill.ast
[error]         stmt"${(i.onConflictUpdate(_.i)((t, e) => t.s -> e.s).ast: Ast).token}" mustEqual
[error]                                        ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:457:36: value ast is not a member of io.getquill.testContext.Insert[io.getquill.testContext.TestEntity]
[error]         stmt"${(i.onConflictIgnore.ast: Ast).token}" mustEqual
[error]                                    ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:461:46: value ast is not a member of io.getquill.testContext.Insert[io.getquill.testContext.TestEntity]
[error]         stmt"${(i.onConflictIgnore(_.i, _.s).ast: Ast).token}" mustEqual
[error]                                              ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:465:86: value ast is not a member of io.getquill.testContext.Insert[io.getquill.testContext.TestEntity]
[error]         stmt"${(i.onConflictUpdate((t, e) => t.s -> e.s, (t, e) => t.i -> (t.i + 1)).ast: Ast).token}" mustEqual
[error]                                                                                      ^
[error] /app/quill-core/src/test/scala/io/getquill/context/mirror/MirrorIdiomSpec.scala:469:63: value ast is not a member of io.getquill.testContext.Insert[io.getquill.testContext.TestEntity]
[error]         stmt"${(i.onConflictUpdate(_.i)((t, e) => t.s -> e.s).ast: Ast).token}" mustEqual

hntd187 · 2018-04-09T18:13:17Z

Does any of this borrow from the pull req I made a lifetime ago? If it's a continuation of that can I close the other since @mentegy has seemed to pick this up?

mosyp · 2018-04-09T19:33:03Z

@fwbrasil I'll fix it tomorrow once will get access to my laptop.
@hntd187 I was thinking of doing that once this one will be merged

mosyp · 2018-04-10T10:48:18Z

@getquill/maintainers It's all green now!
(except coverage, however not covered parts are not PR changes)

mosyp · 2018-04-12T17:39:56Z

@fwbrasil Build is passing and PR is updated regarding your notes. This PR blocks our next release

fwbrasil · 2018-04-12T17:46:25Z

@mentegy I think you missed my comments about naming

…d MySQL

mosyp · 2018-04-12T18:43:03Z

@fwbrasil oops, I must have pushed wrong version when syncing with upstream. Now your notes are applied

fwbrasil · 2018-04-12T19:45:56Z

This is exciting! Users have been asking for this feature for so long

dsounded · 2018-04-13T05:41:17Z

@mentegy Awesome )

mosyp changed the title ~~[WIP] Ass support of upsert for Postgres and MySQL~~ [WIP] Add support of upsert for Postgres and MySQL Nov 30, 2017

mosyp force-pushed the upsert-v2 branch 2 times, most recently from 613f05a to 956c27e Compare December 9, 2017 12:47

mosyp force-pushed the upsert-v2 branch 4 times, most recently from a2e4f6d to aee5a50 Compare January 11, 2018 18:50

mosyp force-pushed the upsert-v2 branch 2 times, most recently from aa559a1 to f1926ee Compare January 13, 2018 11:28

mosyp force-pushed the upsert-v2 branch 4 times, most recently from ce117c3 to c0682ae Compare February 7, 2018 18:16

mosyp force-pushed the upsert-v2 branch from c0682ae to 4aef7dd Compare February 26, 2018 13:47

mosyp force-pushed the upsert-v2 branch 3 times, most recently from 29f41c2 to 3853c18 Compare April 4, 2018 08:42

mosyp mentioned this pull request Apr 6, 2018

Change referencing super.prepare call to this.prepare in quill-cassandra contexts #1067

Merged

mosyp force-pushed the upsert-v2 branch from 374ce91 to 1707187 Compare April 6, 2018 14:55

mosyp changed the title ~~[WIP] Add support of upsert for Postgres and MySQL~~ Add support of upsert for Postgres and MySQL Apr 6, 2018

mosyp force-pushed the upsert-v2 branch from 5fc1557 to a981ebc Compare April 6, 2018 16:10

mosyp mentioned this pull request Apr 8, 2018

trigger 2.3.4 release #1068

Merged

fwbrasil reviewed Apr 9, 2018

View reviewed changes

mosyp force-pushed the upsert-v2 branch from a981ebc to 5767555 Compare April 9, 2018 13:58

mosyp force-pushed the upsert-v2 branch from 5767555 to bab4796 Compare April 9, 2018 16:38

mosyp force-pushed the upsert-v2 branch from bab4796 to 75d1efd Compare April 9, 2018 18:39

mosyp force-pushed the upsert-v2 branch from 75d1efd to 3aec36e Compare April 10, 2018 09:19

mosyp mentioned this pull request Apr 10, 2018

prepare 2.4.0 release #1071

Merged

mosyp force-pushed the upsert-v2 branch from 3aec36e to f141d77 Compare April 10, 2018 10:05

mosyp mentioned this pull request Apr 12, 2018

prepare 2.4.1 #1072

Merged

mosyp force-pushed the upsert-v2 branch from f141d77 to b6a0066 Compare April 12, 2018 14:30

Add support of upsert (insert or update, on conflict) for Postgres an…

7607e77

…d MySQL

mosyp force-pushed the upsert-v2 branch from b6a0066 to 7607e77 Compare April 12, 2018 18:42

fwbrasil approved these changes Apr 12, 2018

View reviewed changes

fwbrasil merged commit c5760eb into zio:master Apr 12, 2018

mosyp mentioned this pull request Aug 1, 2018

Support MySQL's INSERT IGNORE statement #756

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support of upsert for Postgres and MySQL #987

Add support of upsert for Postgres and MySQL #987

mosyp commented Nov 30, 2017 •

edited

Loading

Nickersoft commented Jan 30, 2018

mosyp commented Jan 30, 2018

Nickersoft commented Jan 31, 2018

mosyp commented Apr 6, 2018

fwbrasil Apr 9, 2018

fwbrasil Apr 9, 2018

fwbrasil commented Apr 9, 2018

fwbrasil commented Apr 9, 2018

hntd187 commented Apr 9, 2018

mosyp commented Apr 9, 2018

mosyp commented Apr 10, 2018 •

edited

Loading

mosyp commented Apr 12, 2018

fwbrasil commented Apr 12, 2018

mosyp commented Apr 12, 2018

fwbrasil commented Apr 12, 2018

dsounded commented Apr 13, 2018

		@@ -92,6 +92,8 @@ case class If(condition: Ast, `then`: Ast, `else`: Ast) extends Ast

		case class Assignment(alias: Ident, property: Ast, value: Ast) extends Ast

		case class Excluded(alias: Ident) extends Ast

		@@ -129,6 +131,16 @@ case class Returning(action: Ast, alias: Ident, property: Ast) extends Action

		case class Foreach(query: Ast, alias: Ident, body: Ast) extends Action

		case class Conflict(insert: Ast, target: Conflict.Target, action: Conflict.Action) extends Action

Add support of upsert for Postgres and MySQL #987

Add support of upsert for Postgres and MySQL #987

Conversation

mosyp commented Nov 30, 2017 • edited Loading

Checklist

Nickersoft commented Jan 30, 2018

mosyp commented Jan 30, 2018

Nickersoft commented Jan 31, 2018

mosyp commented Apr 6, 2018

fwbrasil Apr 9, 2018

Choose a reason for hiding this comment

fwbrasil Apr 9, 2018

Choose a reason for hiding this comment

fwbrasil commented Apr 9, 2018

fwbrasil commented Apr 9, 2018

hntd187 commented Apr 9, 2018

mosyp commented Apr 9, 2018

mosyp commented Apr 10, 2018 • edited Loading

mosyp commented Apr 12, 2018

fwbrasil commented Apr 12, 2018

mosyp commented Apr 12, 2018

fwbrasil commented Apr 12, 2018

dsounded commented Apr 13, 2018

mosyp commented Nov 30, 2017 •

edited

Loading

mosyp commented Apr 10, 2018 •

edited

Loading